On Tuesday, June 26, 2012, Mostafa Alshrief
wrote:
>
>> If any of the uncommitted changes collide with files changed between
branches, it will refuse to switch, and ask you to stash the changes first
>
> what do you mean by collide with files..?
If A.txt on master is different from A.txt on devel
Ah ok Thanks
I also realized that what I am expecting to do would still be impossible.
Thanks
Tjad
On Wednesday, 27 June 2012 14:17:22 UTC+2, Thomas Ferris Nicolaisen wrote:
>
> On Wednesday, June 27, 2012 2:00:40 PM UTC+2, Tjad Clark wrote:
>
>> Hi
>>
>> Could the GIT team please have the stas
Just, FYI, "git checkout master" automatically does the tracking of a
remote branch with the same name by convention. This is due to the
"branch.autosetupmerge" configuration switch being on by default.
On Wednesday, June 27, 2012 2:16:15 PM UTC+2, mike wrote:
>
> Hi,
>
> I managed to do the fol
On Wednesday, June 27, 2012 2:00:40 PM UTC+2, Tjad Clark wrote:
> Hi
>
> Could the GIT team please have the stash command (or at the very least a
> switch) to stash all changes as well as all files that have been marked
> --assume-unchanged
>
> Thanks
> Tjad
>
Hi,
You have to direct feature r
Hi,
I managed to do the following:
git checkout master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
Then I merged release-2.2.16 to this branch. When done I pushed it.
I checked and remote master now contains my changes.
Thanks for all help!
Hi
Could the GIT team please have the stash command (or at the very least a
switch) to stash all changes as well as all files that have been marked
--assume-unchanged
Thanks
Tjad
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To vi
On Wednesday, June 27, 2012 12:38:07 PM UTC+2, mike wrote:
>
> You've just checked out a commit as your HEAD that is the head of the
>> origin/master branch. But you need to checkout a new branch master
>> that will be a copy (local fork) of the origin/master or more probably
>> you need to ch
> > So from Eclipse I checkout the master called origin/master.
> > Then I select Team --> 'Merge' and I get the following message:
> >
> > "HEAD is not pointing to a branch"
>
> You do not have any local branch pointing to checked out commit now
> really.
>
> You've just checked out a c
On Wed, Jun 27, 2012 at 12:30 PM, mike wrote:
> So from Eclipse I checkout the master called origin/master.
> Then I select Team --> 'Merge' and I get the following message:
>
> "HEAD is not pointing to a branch"
You do not have any local branch pointing to checked out commit now really.
You've
Hi,
I our open source project we are using git. I have created a release
branch, release-2.2.16, that we have done some fixes on and now I want to
add the stable release
to the master ( and develop). So from Eclipse I checkout the master called
origin/master.
Then I select Team --> 'Merge' and
On Wednesday, June 27, 2012 1:52:39 AM UTC+2, Mostafa Alshrief wrote:
>
>
> Git will bring along any uncommitted changes when checking out another
>> branch. It doesn't corrupt or change the branches
>>
> i meant missing the content of the master branch by updating it's content
> from the develo
11 matches
Mail list logo
