On Mon, 3 Nov 2014 13:53:51 -0800 (PST)
Anthony Berglas wrote:
> > For instance, you take for granted that everyone would use
> > `git commit -a` for a start and then may be try using "advanced"
> > stuff. But as one example, here at my $dayjob a bunch of webdevs
> > hired about 2-3 month ago us
>
>
> git fetch origin
> git merge origin/master
>
OK, maybe safer.
For instance, you take for granted that everyone would use
> `git commit -a` for a start and then may be try using "advanced" stuff.
> But as one example, here at my $dayjob a bunch of webdevs hired about
> 2-3 month a
On Sun, 2 Nov 2014 18:26:15 -0800 (PST)
Anthony Berglas wrote:
> Thank you for all your very considered replies. The solution I end
> ed up using (without the complex explanations) was
>
> git push
> # fail
> git pull
> git merge origin/master
This step is not needed: `git pull`, when you're o
Hello All,
Thank you for all your very considered replies. The solution I end ed up
using (without the complex explanations) was
git push
# fail
git pull
git merge origin/master
# resolve conflicts
git push
This should go up the front of any manual of GIT, right after git clone.
But I have n
you can take a look at
http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches#Pulling
Or
http://git-scm.com/docs/git-pull
2014-10-31 4:18 GMT-03:00 Gergely Polonkai :
> Hello,
>
> let me fix this up a bit:
>
> On 31 Oct 2014 04:39, "Rick Umali" wrote:
> >
> > On Thursday, October 30, 201
Hello,
let me fix this up a bit:
On 31 Oct 2014 04:39, "Rick Umali" wrote:
>
> On Thursday, October 30, 2014 2:41:42 AM UTC-4, Anthony Berglas wrote:
>>
>> I am trying to do something really simple. I want to commit local
changes to a remote repository. But along the way other developers
modif
On Thursday, October 30, 2014 2:41:42 AM UTC-4, Anthony Berglas wrote:
>
> I am trying to do something really simple. I want to commit local changes
> to a remote repository. But along the way other developers modified the
> remote. This appears to be very difficult to do in Git.
>
You can mo
