You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Mike Tutkowski <mi...@solidfire.com> on 2013/05/06 19:21:47 UTC
Git merge question
Hi everyone,
I've used SVN for many years, but am a bit new to Git.
I've been making changes locally in my repo for a while and wanted to
update my repo from the "upstream" repo, but do not want to first stage or
commit changes locally.
I get the following error message:
mtutkowski-LT:incubator-cloudstack mtutkowski$ git merge upstream/master
Updating 73d87f1..4c0eecc
error: Your local changes to the following files would be overwritten by
merge:
client/pom.xml
client/tomcatconf/applicationContext.xml.in
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
server/src/com/cloud/storage/VolumeManagerImpl.java
Please, commit your changes or stash them before you can merge.
Aborting
If I do a git stash, then git merge upstream/master, then un-stash, should
that work as I might expect (where the un-stash will lead to a merge of
sorts since some stashed files will be different from the newly merged
ones)?
Thanks!
--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*™*
Re: Git merge question
Posted by Chip Childers <ch...@sungard.com>.
Yes, git is a completely different workflow. Branch frequently...
commit frequently...
On Wed, May 8, 2013 at 9:23 PM, Mike Tutkowski
<mi...@solidfire.com> wrote:
> I see...maybe a local commit would have been preferable.
>
> I'm used to not committing until I have the code in a stable state
> (probably typical with centralized VCSs like SVN), but with my local repo I
> suppose it doesn't matter as much.
>
>
> On Wed, May 8, 2013 at 5:45 PM, Chip Childers <ch...@sungard.com>wrote:
>
>> On Mon, May 06, 2013 at 11:21:47AM -0600, Mike Tutkowski wrote:
>> > Hi everyone,
>> >
>> > I've used SVN for many years, but am a bit new to Git.
>> >
>> > I've been making changes locally in my repo for a while and wanted to
>> > update my repo from the "upstream" repo, but do not want to first stage
>> or
>> > commit changes locally.
>> >
>> > I get the following error message:
>> >
>> > mtutkowski-LT:incubator-cloudstack mtutkowski$ git merge upstream/master
>> > Updating 73d87f1..4c0eecc
>> > error: Your local changes to the following files would be overwritten by
>> > merge:
>> > client/pom.xml
>> > client/tomcatconf/applicationContext.xml.in
>> >
>> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
>> > server/src/com/cloud/storage/VolumeManagerImpl.java
>> > Please, commit your changes or stash them before you can merge.
>> > Aborting
>> >
>> > If I do a git stash, then git merge upstream/master, then un-stash,
>> should
>> > that work as I might expect (where the un-stash will lead to a merge of
>> > sorts since some stashed files will be different from the newly merged
>> > ones)?
>>
>> git stash will stash the changes, and then git stash pop will attempt to
>> re-apply them. If there are conflicts, you will have to sort them out
>> after the pop.
>>
>> OTOH, you should consider committing as you go in a local branch, and
>> merging the latest from master periodically into that branch.
>>
>> >
>> > Thanks!
>> >
>> > --
>> > *Mike Tutkowski*
>> > *Senior CloudStack Developer, SolidFire Inc.*
>> > e: mike.tutkowski@solidfire.com
>> > o: 303.746.7302
>> > Advancing the way the world uses the
>> > cloud<http://solidfire.com/solution/overview/?video=play>
>> > *™*
>>
>
>
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkowski@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the
> cloud<http://solidfire.com/solution/overview/?video=play>
> *™*
Re: Git merge question
Posted by Mike Tutkowski <mi...@solidfire.com>.
I see...maybe a local commit would have been preferable.
I'm used to not committing until I have the code in a stable state
(probably typical with centralized VCSs like SVN), but with my local repo I
suppose it doesn't matter as much.
On Wed, May 8, 2013 at 5:45 PM, Chip Childers <ch...@sungard.com>wrote:
> On Mon, May 06, 2013 at 11:21:47AM -0600, Mike Tutkowski wrote:
> > Hi everyone,
> >
> > I've used SVN for many years, but am a bit new to Git.
> >
> > I've been making changes locally in my repo for a while and wanted to
> > update my repo from the "upstream" repo, but do not want to first stage
> or
> > commit changes locally.
> >
> > I get the following error message:
> >
> > mtutkowski-LT:incubator-cloudstack mtutkowski$ git merge upstream/master
> > Updating 73d87f1..4c0eecc
> > error: Your local changes to the following files would be overwritten by
> > merge:
> > client/pom.xml
> > client/tomcatconf/applicationContext.xml.in
> >
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
> > server/src/com/cloud/storage/VolumeManagerImpl.java
> > Please, commit your changes or stash them before you can merge.
> > Aborting
> >
> > If I do a git stash, then git merge upstream/master, then un-stash,
> should
> > that work as I might expect (where the un-stash will lead to a merge of
> > sorts since some stashed files will be different from the newly merged
> > ones)?
>
> git stash will stash the changes, and then git stash pop will attempt to
> re-apply them. If there are conflicts, you will have to sort them out
> after the pop.
>
> OTOH, you should consider committing as you go in a local branch, and
> merging the latest from master periodically into that branch.
>
> >
> > Thanks!
> >
> > --
> > *Mike Tutkowski*
> > *Senior CloudStack Developer, SolidFire Inc.*
> > e: mike.tutkowski@solidfire.com
> > o: 303.746.7302
> > Advancing the way the world uses the
> > cloud<http://solidfire.com/solution/overview/?video=play>
> > *™*
>
--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*™*
Re: Git merge question
Posted by Chip Childers <ch...@sungard.com>.
On Mon, May 06, 2013 at 11:21:47AM -0600, Mike Tutkowski wrote:
> Hi everyone,
>
> I've used SVN for many years, but am a bit new to Git.
>
> I've been making changes locally in my repo for a while and wanted to
> update my repo from the "upstream" repo, but do not want to first stage or
> commit changes locally.
>
> I get the following error message:
>
> mtutkowski-LT:incubator-cloudstack mtutkowski$ git merge upstream/master
> Updating 73d87f1..4c0eecc
> error: Your local changes to the following files would be overwritten by
> merge:
> client/pom.xml
> client/tomcatconf/applicationContext.xml.in
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
> server/src/com/cloud/storage/VolumeManagerImpl.java
> Please, commit your changes or stash them before you can merge.
> Aborting
>
> If I do a git stash, then git merge upstream/master, then un-stash, should
> that work as I might expect (where the un-stash will lead to a merge of
> sorts since some stashed files will be different from the newly merged
> ones)?
git stash will stash the changes, and then git stash pop will attempt to
re-apply them. If there are conflicts, you will have to sort them out
after the pop.
OTOH, you should consider committing as you go in a local branch, and
merging the latest from master periodically into that branch.
>
> Thanks!
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkowski@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the
> cloud<http://solidfire.com/solution/overview/?video=play>
> *™*