[parted-devel] branch merge?

[Otavio Salvador]

"Debarshi 'Rishi' Ray" <debarshi.ray at gmail.com> writes:

>> Not really, as I explained at IRC for you he did a small mistake when
>> pushing back his changes to us.
>
> Actually I was in the process of changing my local repositories
> 'master' branch, when Jim pushed something to the remote repository
> and I tried to pull his changes. It was a mistake on my part to do
> 'git pull' which caused this problem.
>
>> Debarshi,
>>
>> When you do changes on a branch and want to sync it with a remote one,
>> you shouldn't use git pull. Instead do:
>>
>> git fetch origin/master
>> git rebase origin/master
>
> Ok.
>
> Should I revert the commit which caused the problem?

No. Just verify your branch before pushing. Usually a git log avoid
those mistakes ;-)

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio at debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
 you the whole house."