On Tuesday, April 17, 2012 7:59:43 PM UTC+2, Patrick wrote:
>
> I run into this problem a couple times and I have not figured out how 
> to fix it. 
>
> -In a central repo environment 
>
> -local system A gets new changes pushed up to central repo 
>
> -local system B has changes and pulls from the central repo creating a 
> merge conflict. 
>
> After reviewing the merge conflict it is decided to drop the changes 
> on local system B and match it up with the central repo. 
>
> I ultimately have just deleted the local repo on local system B and 
> checked it out again. 
>

It's easier to do a git reset --hard origin/master (assuming the branch is 
called master and the remote is called origin). 

>
> I do want to know when the merge conflict exists so I can check it 
> but, is there a way to drop the pull that local system B did and pull 
> the central repo version after I decide review it? 


Not sure if I understand what you mean here. Usually I would do a 

git fetch origin

to get hold of what's going on in the central repo. 

I'd then have a look at the histories with

git log --graph --oneline --decorate --all

and then decide what to do. If I think the local changes are worth keeping 
(which they probably are, cause I made them for a reason), I'll do

git rebase origin/master

(this is the same as doing a git pull --rebase in the first place). This 
places my local commits orderly after the ones coming from central.

I could also put my local commits in a branch, and merge them in, but I'll 
keep out that scenario for now.



On Tuesday, April 17, 2012 7:59:43 PM UTC+2, Patrick wrote:
>
> I run into this problem a couple times and I have not figured out how 
> to fix it. 
>
> -In a central repo environment 
>
> -local system A gets new changes pushed up to central repo 
>
> -local system B has changes and pulls from the central repo creating a 
> merge conflict. 
>
> After reviewing the merge conflict it is decided to drop the changes 
> on local system B and match it up with the central repo. 
>
> I ultimately have just deleted the local repo on local system B and 
> checked it out again. 
>
> I do want to know when the merge conflict exists so I can check it 
> but, is there a way to drop the pull that local system B did and pull 
> the central repo version after I decide review it? 
>

On Tuesday, April 17, 2012 7:59:43 PM UTC+2, Patrick wrote:
>
> I run into this problem a couple times and I have not figured out how 
> to fix it. 
>
> -In a central repo environment 
>
> -local system A gets new changes pushed up to central repo 
>
> -local system B has changes and pulls from the central repo creating a 
> merge conflict. 
>
> After reviewing the merge conflict it is decided to drop the changes 
> on local system B and match it up with the central repo. 
>
> I ultimately have just deleted the local repo on local system B and 
> checked it out again. 
>
> I do want to know when the merge conflict exists so I can check it 
> but, is there a way to drop the pull that local system B did and pull 
> the central repo version after I decide review it? 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/2nz-f41HYtcJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to