Versions Compared

Old Version 9

changes.mady.by.user Steve Varnau

Saved on

compared with

New Version Current

changes.mady.by.user Sandhya

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

You create a private fork of Trafodion on https://github.com/apache/incubator-trafodion. Use the fork button top-right on the page to create your fork, which will be named <your-git-id>_fork.

...

Code Block
languagebash
titleClone Trafodion Repository
# Move to the directory where you want to install the Trafodion source code.
cd mysource

# Clone the Trafodion source code
git clone git://git.apache.org/incubator-trafodion.git

# Change to the Trafodion source-tree directory
cd incubator-trafodion
 
# Register your fork as a remote branch
git remote add trafdeveloper_fork git@github.com:trafdeveloper/incubator-trafodion

At this point, you’ve finished all preparation steps. Now, you can start making changes.

...

  1.  Go to https://github.com/apache/incubator-trafodion. 
  2. Click the green Create Pull Request button. 
  3. Review changes one more time before clicking Create Pull Request.

...

The pull request gets reviewed by the committers and other contributors. Once you get a consensus, the committer merges your changes into the target incubator- trafodion branch. Check your e-mail for comments.

...

  1. Check out the code: git checkout TRAFODION-1507
  2. Make the requested changes.
  3. Run regression tests, if applicable.
  4. Commit the changes with appropriate change information: git commit -a
  5. Push the changes back to your private git fork: git push trafdeveloper_fork TRAFODION-1507
Info

The push command automatically adds the change to the active pull request.

Warning

Do not use the git commit --amend or git rebase command after pushing a commit.

Resolve Merge Conflicts

Sometimes someone else's changes reach the target branch (e.g., master) before yours and has a merge conflict with your changes. Github will flag that situation in the status of your pull request. Before your changes can be merged, you must resolve conflicts in your pull request. This is the same process as above, making code changes, except that a merge command is done to create the changes.

Using the prior example:

  1. Check out the code: git checkout TRAFODION-1507
  2. git fetch origin
  3. git merge origin/master
  4. Resolve conflicts.
  5. Run regression tests, if applicable.
  6. Commit the changes with appropriate change information: git commit -a
  7. Push the changes back to your private git fork: git push trafdeveloper_fork TRAFODION-1507

Change Merge

If all is well, a committer will merge your change into the Apache repository, which is mirrored on GitHub. You may be asked to close out the JIRA or other follow up.

Your change is done. Thanks for your contribution to Trafodion.

...