Re: Error while pushing commits for bug 93240

2015-08-29 Thread Norbert Thiebaud
On Sat, Aug 29, 2015 at 12:21 PM, Daniel danlrobertso...@gmail.com wrote: In general as opposed to merging origin/master you would be better off using rebase origin/master. To add to that: it is not just 'in general' for this project it is a rule. no merge commit. when refreshing you local

Error while pushing commits for bug 93240

2015-08-28 Thread Shreyansh Gandhi
Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Shreyansh Gandhi
This is the output of ./logerrit submit master ./logerrit submit master Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Shreyansh Gandhi
*./logerrit submit master* Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Samuel Mehrbrodt
Try ./logerrit submit master Check https://wiki.documentfoundation.org/Development/gerrit for more information. Samuel Am 28.08.2015 um 10:58 schrieb Shreyansh Gandhi: Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Eike Rathke
Hi Shreyansh, On Friday, 2015-08-28 10:07:00 +, Shreyansh Gandhi wrote: ! [remote rejected] HEAD - refs/for/master (change 9724 closed) You are attempting to push a change to gerrit that has the same Change-Id as change number 9724 on gerrit, which happens to be a long closed change,

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Eike Rathke
Hi, On Friday, 2015-08-28 11:21:45 +0200, Samuel Mehrbrodt wrote: Try ./logerrit submit master Be careful though, ./logerrit pushes every change from your local branch that is on top of the origin, which may explain why you had the problem with the closed 9724 change if that commit still

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Shreyansh Gandhi
Same result:- git push origin HEAD:refs/for/master Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9)

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Shreyansh Gandhi
Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Markus Mohrhard
Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done.

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Ashod Nakashian
On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done.

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Markus Mohrhard
Hey, On Fri, Aug 28, 2015 at 4:52 PM, Ashod Nakashian ashnak...@gmail.com wrote: On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. No. Please read the error

Re: Error while pushing commits for bug 93240

2015-08-28 Thread Shreyansh Gandhi
http://pastebin.com/zWu0ZedZ On Fri, Aug 28, 2015 at 8:24 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 4:52 PM, Ashod Nakashian ashnak...@gmail.com wrote: On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same