| newbie Q - best practice reviewing diff local/remote master [message #661673] |
Fri, 25 March 2011 21:38  |
Eclipse User |
|
|
|
Hi,
When I can't push to a remote repository because the push is not a fast
forward and I need to do a pull, I would like to know the difference
between what I am about to pull and what I have committed locally. (I an
also interested in diff between "pull" and workspace, but this is not as
important).
I want to know this because I want to know how much trouble I will have
with a potential merge (maybe it is best to have someone fix "their
mistakes" before merging, or maybe I should perform some additional
cleanup, etc.)
What is the recommended way of doing this? I tried looking at the
synchronize view, and it does not seem to give me what I want (it is at
least very different from the synchronize view I am accustomed to with SVN).
I am otherwise quite happy with Egit (currently on version 0.11.something)
Regards
- henrik
|
|
|
|
|
| Re: newbie Q - best practice reviewing diff local/remote master [message #663275 is a reply to message #662707] |
Mon, 04 April 2011 09:16  |
| Eclipse User |
|
|
|
On 3/31/11 5:19 PM, Stefan Lay wrote:
>
> "Henrik Lindberg" <henrik.lindberg@cloudsmith.com> wrote in message
> news:imjh64$nsq$1@news.eclipse.org...
>> I think I found the source of my confusion - there are lots of
>> outgoing changes listed that should not be there. The changes are all
>> in "bin" directories. If I add "bin" to .gitignore, the synchronize
>> view stops listing them.
>
>> The bin directories seems to be automatically ignored expect in the
>> synchronize view. Is this by design? To force me to deal with them?
>
> This is a bug. The bin folder is not excluded from the <working tree>
> node. I opened bug 341502 for this.
Thanks.
> However, it is excluded if you select the "Workspace" model in the
> drop-down list, right?
>
Did not check, and now all my derived folders are in .gitignore...
> Note that at the moment the EGit synchronize view does not fetch from
> remote (See bug 323353).
> You have to do that in advance.
>
Aha, that explains some of the additional confusion I had over not
seeing what I expected to see. Thanks for the tip.
- henrik
|
|
|
Powered by
FUDForum. Page generated in 0.05141 seconds
Home