latest 20 messages by pagios
+
[2014-09-17T08:44:51Z]
pagios
i want to remove my stash (DELETE IT)
+
[2014-09-17T08:38:34Z]
pagios
so if i stash and psu afterwards my stash will be pushed?
+
[2014-09-17T08:36:11Z]
pagios
how do i stash them
+
[2014-09-17T08:36:08Z]
pagios
Please, commit your changes or stash them before you can merge.
+
[2014-09-08T13:20:32Z]
pagios
and since i dont have anything yet to merge it compains?
+
[2014-09-08T13:18:45Z]
pagios
why do qw make a git fetch && git checkout master insteadf of git pull for the first time?
+
[2014-09-06T13:36:00Z]
pagios
Nevik: ?
+
[2014-09-06T13:35:45Z]
pagios
if i have modified not staged file , and i pull will that file be overwritten by the pull?
+
[2014-09-06T09:24:02Z]
pagios
>>>>>>>>> 42342314341324
+
[2014-09-06T09:24:00Z]
pagios
having such stuff added to my files...
+
[2014-09-06T09:22:59Z]
pagios
what is HEAD>>>> and <<< HEAD
+
[2014-09-06T09:03:57Z]
pagios
ok
+
[2014-09-06T09:03:19Z]
pagios
you cannot have pull if you have commits
+
[2014-09-06T09:02:47Z]
pagios
so i can only pull after i pushed all my commits
+
[2014-09-06T09:01:58Z]
pagios
and if it cannot merge it will complain but NEVER overwrite right?
+
[2014-09-06T09:01:29Z]
pagios
Nevik: but will the pull OVERVwrite my index.html
+
[2014-09-06T09:00:48Z]
pagios
Nevik: ^
+
[2014-09-06T09:00:04Z]
pagios
Neptu: so mainly if i have index.html in my directory and i pull and in that pull i have an index.html updated by my developer, would my index.html be overwritten or git will merge my index.html with his index.html and create a new index.html containng both my code and his?
+
[2014-09-06T08:56:49Z]
pagios
Nevik: if for instance i work on lines 1..100 and another dev works on line 101 to 202 can we merge all code together? or do i have to push first, then he pulls, get the data i wrote and readd to his code and oush?
+
[2014-09-06T08:50:37Z]
pagios
they should coordinate their push/pull