@Thomas -- I get the following message..it saying there are merge conflicts
,even if there are merge conflitcs..it should sync all the files and git
status should show them but git status just shows 2 files while there are
10 files in the patch set.
error: could not apply d50d931... code:
@Thomas - here is the info you asked http://pastie.org/566
Please share with us the following:
a) The output of git show --name-status d50d931
b) The output of git status - right after cherry-picking
c) The Parent(s) of the Patch-set in the Gerrit UI
d) Any Dependencies of the
I made some changes to one of files locally,I want to commit the change but
when i do git status I get the following message,how can I commit the
change I made?
# On branch upload_branch
# Your branch is ahead of 'quic/master' by 1 commit.
#
nothing to commit, working directory clean
--
Solution was the changes in the files already existed
On Friday, January 11, 2013 2:26:31 AM UTC-8, Thomas Ferris Nicolaisen
wrote:
On Friday, January 11, 2013 9:40:47 AM UTC+1, python...@gmail.com wrote:
c) The Parent(s) of the Patch-set in the Gerrit UI
You pasted the wrong thing in
Hi all-
I am trying to revert one of the commits i made using the following command
and running into following error,are there ways to revert commits that are
already done?
cmdgit revert 565c775b3fe2b66c7ad4431ffde65fe73f0dbc5e
error: could not revert 565c775... code: Fix the Max Tx power
Thanks Thomas - whats the difference between git commit -a and git add?
On Sunday, January 13, 2013 12:12:22 PM UTC-8, Thomas Ferris Nicolaisen
wrote:
On Sunday, January 13, 2013 8:54:38 PM UTC+1, python...@gmail.com wrote:
Hi all-
I am trying to revert one of the commits i made using the
I have the following recent commits when I do git log --oneline...I want
to rebase to 8ec2027,I tried some rebase commands that didnot work..what
is the exact command to do this?
2503013 code: cs release 1.2.3.47
269ed14 code: Fixed below issues due to which 2nd client is not associating
to GO
Hi,
1. I am trying to apply a commit which was done a while back on the HEAD.
git log --oneline shows the following and lets say I want to apply the
commit 2618b13 on the HEAD.
2617b13
2614b13
2611b13
2618b13
2618b13 -- I want to apply this change on the HEAD
I am trying the following command
I am trying to push a change to a remote server and running into change
closed error,thats because the change-id am
trying to push is same as an earlier change that was already pushed(dont
know why its same),I trid to generate a new commit
message using the .git/hook,it generates a new
@Thomas - I already tried removing the change-ed from the commit
message,editing the message but a new change-id is not being generated
automatically...do you have any other suggestions?
On Sunday, January 20, 2013 12:54:15 AM UTC-8, Thomas Ferris Nicolaisen
wrote:
Remove the Change-id from
This is really important for me..any inputs on this is truly appreciated
On Sunday, January 20, 2013 9:57:08 AM UTC-8, python...@gmail.com wrote:
@Thomas - I already tried removing the change-ed from the commit
message,editing the message but a new change-id is not being generated
I am trying to cherry-pick a gerrit based on git project test.git ,for some
gerrits I see it tries to delete as below by creating one more test
folder inside the test directory..any idea what could be wrong here?please
let me know if you need more details.
Unmerged paths:
# (use git add/rm
12 matches
Mail list logo
