anil@localhost:~/as7/jboss-as$ git rebase --abort
HEAD is now at 4340a3b changed jaas to security-domains
anil@localhost:~/as7/jboss-as$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: Fixing the standalone client module name
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging webservices/server-integration/pom.xml
CONFLICT (content): Merge conflict in webservices/server-integration/pom.xml
Failed to merge in the changes.
Patch failed at 0001 Fixing the standalone client module name

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

anil@localhost:~/as7/jboss-as$ vi webservices/server-integration/pom.xml
anil@localhost:~/as7/jboss-as$ git rebase --continue
webservices/server-integration/pom.xml: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      webservices/server-integration/pom.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
no changes added to commit (use "git add" and/or "git commit -a")
anil@localhost:~/as7/jboss-as$ git add webservices/server-integration/pom.xml
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git rebase --continue
Applying: Fixing the standalone client module name
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

anil@localhost:~/as7/jboss-as$ git rebase --continue
Applying: Fixing the standalone client module name
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

anil@localhost:~/as7/jboss-as$ git rebase --abort
HEAD is now at 4340a3b changed jaas to security-domains
anil@localhost:~/as7/jboss-as$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git log master..upstream/master
commit 328151ea9f3b83816ea03f5dbd43898271c0df90
Author: Anil Saldhana <anil.saldhana@jboss.com>
Date:   Wed Mar 16 14:10:31 2011 -0500

    changed jaas to security-domains

commit 23478c35d65cecca86caf0af9e3886056b1dd3ed
Author: Anil Saldhana <anil.saldhana@jboss.com>
Date:   Wed Mar 16 11:16:12 2011 -0500

    test

commit ff07b4a653a5d68eefbdad15f938e60f42cd9e6a
Author: Anil Saldhana <anil.saldhana@jboss.com>
Date:   Wed Mar 16 11:11:33 2011 -0500

    add test case

commit b3e90b9cdc9a55f6c3f936bb2819a4c022f98987
Author: Marcus Moyses <marcus.moyses@gmail.com>
Date:   Wed Mar 16 13:01:30 2011 -0300

    replace jaas with security-domains in the model

commit d8e774b4059bff2d9f17e2e04bec6e8fdbb610f8
Author: David M. Lloyd <david.lloyd@redhat.com>
Date:   Wed Mar 16 13:57:17 2011 -0500

    Remove duplicate module def; be more emphatic about alphabetization

commit ae0b5f0d6314f9ace7490e38dd2c69bdef236105
Author: David M. Lloyd <david.lloyd@redhat.com>
Date:   Wed Mar 16 11:53:18 2011 -0500
anil@localhost:~/as7/jboss-as$ git pull --rebase upstream master
From git://github.com/jbossas/jboss-as
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Fixing the standalone client module name
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging webservices/server-integration/pom.xml
CONFLICT (content): Merge conflict in webservices/server-integration/pom.xml
Failed to merge in the changes.
Patch failed at 0001 Fixing the standalone client module name

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

anil@localhost:~/as7/jboss-as$ vi webservices/server-integration/pom.xml
anil@localhost:~/as7/jboss-as$ git rebase --continue
webservices/server-integration/pom.xml: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
anil@localhost:~/as7/jboss-as$ vi webservices/server-integration/pom.xml
anil@localhost:~/as7/jboss-as$ git add
Nothing specified, nothing added.
Maybe you wanted to say 'git add .'?
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      webservices/server-integration/pom.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
no changes added to commit (use "git add" and/or "git commit -a")
anil@localhost:~/as7/jboss-as$ git add webservices/server-integration/pom.xml
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git commit -a -m “merge"
>
> ^C
anil@localhost:~/as7/jboss-as$ git commit -a -m “merge"
>
>  webservices/server-integration/pom.xml
> ^C
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git merge upstream/master
Already up-to-date.
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git merge master
Auto-merging security/src/main/resources/schema/jboss-security.xsd
Merge made by recursive.
 .../context/SecurityDomainObjectFactory.java       |  179 ++++++++++++++++++++
 .../processors/SecurityDependencyProcessor.java    |    6 +-
 .../services/org.jboss.as.server.Extension         |   23 +++
 .../src/main/resources/schema/jboss-security.xsd   |   21 +++
 .../META-INF/MANIFEST.MF                           |    8 +
 .../jboss/as/web/deployment/SecurityActions.java   |    2 +-
 .../org/jboss/as/web/security/JBossWebRealm.java   |    2 +-
 .../org/jboss/as/web/security/SecurityActions.java |    2 +-
 8 files changed, 239 insertions(+), 4 deletions(-)
 create mode 100644 security/src/main/java/org/jboss/as/security/context/SecurityDomainObjectFactory.java
 create mode 100644 security/src/main/resources/META-INF/services/org.jboss.as.server.Extension
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)
anil@localhost:~/as7/jboss-as$ git reset --hard upstream/master
HEAD is now at 328151e changed jaas to security-domains
anil@localhost:~/as7/jboss-as$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)



 anil@localhost:~/as7/jboss-as$ !1146
git rebase --abort
HEAD is now at 4340a3b changed jaas to security-domains
anil@localhost:~/as7/jboss-as$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .metadata/
nothing added to commit but untracked files present (use "git add" to track)



anil@localhost:~/as7/jboss-as$ !1149
git pull --rebase upstream master
From git://github.com/jbossas/jboss-as
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Fixing the standalone client module name
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging webservices/server-integration/pom.xml
CONFLICT (content): Merge conflict in webservices/server-integration/pom.xml
Failed to merge in the changes.
Patch failed at 0001 Fixing the standalone client module name

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

anil@localhost:~/as7/jboss-as$