Switch to DuckDuckGo Search
   July 17, 2018
< | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31

bottom
[00:19:26] *** arkef <arkef!59402c1a@gateway/web/freenode/ip.89.64.44.26> has joined #gerrit
[00:23:11] <arkef> Hello guys, im in trouble. i've made some changes locally and then i made commit. But instead of push it to HEAD:refs/for/master i executed git pull origin master and new changes from master were merged. So now i cant do push again :( what to do in this case ?
[00:29:51] <clarkb> arkef: you should be able to reset master to origin then reapply your change on top
[00:30:03] <clarkb> also useful to use topic branches to avoid this problem (and only pull with ff-only
[00:34:35] <arkef> clarkb thank for your response, before you write a message i did something worse i think. i have checked in to my previous commit ... then i pushed my changes succesfully ... and again i pulled from origin master ...
[00:36:48] <arkef> git status says: HEAD detached from 1c67aa3
[01:16:20] *** arkef <arkef!59402c1a@gateway/web/freenode/ip.89.64.44.26> has quit IRC (Quit: Page closed)
[05:35:00] *** marlinc <marlinc!~marlinc@185.167.204.77> has quit IRC (Ping timeout: 256 seconds)
[05:54:25] *** marlinc <marlinc!~marlinc@185.167.204.77> has joined #gerrit
[10:10:29] *** electrofelix <electrofelix!~pelix@15.203.233.80> has joined #gerrit
[10:37:42] *** qchris <qchris!~xanthalan@77.119.130.97.wireless.dyn.drei.com> has quit IRC (Ping timeout: 265 seconds)
[10:50:38] *** qchris <qchris!~xanthalan@178.165.129.20.wireless.dyn.drei.com> has joined #gerrit
[12:42:27] *** gigetoo <gigetoo!~gigetoo@c83-250-50-4.bredband.comhem.se> has quit IRC (Ping timeout: 240 seconds)
[12:51:41] *** gigetoo <gigetoo!~gigetoo@c83-250-50-4.bredband.comhem.se> has joined #gerrit
[13:28:17] *** ldnunes <ldnunes!~ldnunes_@177.194.218.61> has joined #gerrit
[17:08:30] *** mattsm <mattsm!~mattsm@76.205.175.243> has quit IRC (Quit: ZNC 1.8.x-nightly-20180701-4d822118 - https://znc.in)
[17:30:19] *** mattsm <mattsm!~mattsm@76.205.175.243> has joined #gerrit
[19:07:48] *** fungi <fungi!~fungi@cthulhu.yuggoth.org> has joined #gerrit
[20:16:48] *** electrofelix <electrofelix!~pelix@15.203.233.80> has quit IRC (Quit: Leaving.)
[23:01:37] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has quit IRC (Quit: Ping timeout (120 seconds))
[23:02:04] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has joined #gerrit
[23:11:45] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has quit IRC (Quit: Ping timeout (120 seconds))
[23:12:10] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has joined #gerrit
[23:14:54] *** echelog <echelog!~echelog@108.61.103.42> has joined #gerrit
[23:15:12] *** ldnunes <ldnunes!~ldnunes_@177.194.218.61> has quit IRC (Quit: Leaving)
[23:17:11] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has quit IRC (Quit: Ping timeout (120 seconds))
[23:17:40] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has joined #gerrit
[23:21:04] *** echelog <echelog!~echelog@108.61.103.42> has joined #gerrit
[23:21:22] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has quit IRC (Client Quit)
[23:22:28] *** gertvdijk <gertvdijk!~gertvdijk@box2.vultr.gertvandijk.net> has joined #gerrit
top

   July 17, 2018
< | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31