merge

gistfile1.txt

shague@shague-mb:~/git/int_nxt(int_nxt)$ git checkout -b rebase-103736
Switched to a new branch 'rebase-103736'
shague@shague-mb:~/git/int_nxt(rebase-103736)$ git fetch ssh://sh891700@gerrit-ccxsw.broadcom.net:29418/netxtreme refs/changes/36/103736/2 && git checkout FETCH_HEAD
remote: Counting objects: 25, done
remote: Finding sources: 100% (13/13)
remote: Total 13 (delta 12), reused 13 (delta 12)
Unpacking objects: 100% (13/13), done.
From ssh://gerrit-ccxsw.broadcom.net:29418/netxtreme
 * branch                  refs/changes/36/103736/2 -> FETCH_HEAD
Fetching submodule main/Cumulus/common/nitro-headers
+---------------------------------------------------------------------------+
|   Authorized Use Only.  Use of this system must be in accordance with     |
|   our Acceptable Use Policy located at http://accept-use.broadcom.com.    |
|   Activity on this system is subject to monitoring and logging.           |
+---------------------------------------------------------------------------+
Note: checking out 'FETCH_HEAD'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 58c7a2a4f2 thfw: MCG enhancements.
shague@shague-mb:~/git/int_nxt((HEAD detached at FETCH_HEAD))$ git rebase int_nxt
First, rewinding head to replay your work on top of it...
Applying: thfw: MCG enhancements.
Using index info to reconstruct a base tree...
M	main/Cumulus/firmware/core/AFM/core/cfa_mcg.h
M	main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c
Falling back to patching base and 3-way merge...
Auto-merging main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c
CONFLICT (content): Merge conflict in main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c
Auto-merging main/Cumulus/firmware/core/AFM/core/cfa_mcg.h
error: Failed to merge in the changes.
Patch failed at 0001 thfw: MCG enhancements.
hint: Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ git status
rebase in progress; onto 2e3cd20da1
You are currently rebasing.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   main/Cumulus/firmware/core/AFM/core/cfa_p5/hw/cfa_hw_action_sram.c

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:   main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c

shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ vi main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ 
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ 
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ 
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ 
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ 
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ git status
rebase in progress; onto 2e3cd20da1
You are currently rebasing.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   main/Cumulus/firmware/core/AFM/core/cfa_p5/hw/cfa_hw_action_sram.c

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:   main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c

shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ git add main/Cumulus/firmware/core/AFM/core/cfa_p5/cfa_mcg.c
shague@shague-mb:~/git/int_nxt((no branch, rebasing detached HEAD FETCH_HEAD))$ git rebase --continue
Applying: thfw: MCG enhancements.
shague@shague-mb:~/git/int_nxt((HEAD detached from FETCH_HEAD))$ git log --oneline -n5
fbcfceaf0f (HEAD) thfw: MCG enhancements.
2e3cd20da1 (origin/int_nxt, rebase-103736, int_nxt) CTRL-43667: AFM_EEM_SUPPORT is enabled for TFLIB build when it is not required
cab825de38 nvmcfg: hwrm_nvm_factory_defaults result code not set
0a4eb7919b (tag: SIT_int_nxt_v216.1.62.0) bnxtmt: update fastboot images
b330dba6f3 bnxtmt: Full eye scan for Th and Cr
shague@shague-mb:~/git/int_nxt((HEAD detached from FETCH_HEAD))$