Versions Compared

Old Version 6

changes.mady.by.user Wilfred van der Deijl

Saved on

compared with

New Version Current

changes.mady.by.user Wilfred van der Deijl

Saved on

Key

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

...

  1. Fork the project to your own Bitbucket repository. This can be don done with the web based Bitbucket UI.

  2. Clone your fork so you have a local repository on your workstation. You can easily do this from the Bitbucket Web UI and select to Clone in SourceTree (a great Git Windows or Mac client from Atlassian). Or you can use the command line:

    Code Block
    git clone https://bitbucket.org/<your-username>/xml-datacontrol.git

  3. Assign the original adfxmldcoriginal https://bitbucket.org/adfxmldc/xml-datacontrol repository .git repository to a remote called "upstream" in your clone. In SourceTree you can use Add Remote from the Repository menu. Or you can use the command line:

    Code Block
    cd xml-datacontrol
git remote add upstream https://bitbucket.org/adfxmldc/xml-datacontrol.git

  4. If you cloned a while ago, get the latest changes from upstream to ensure you merge all the changes that were made in our central repository. Getting all changes from your own bitbucket repository is done with checkout as your clone is based on that. Fetching all the changes from the project's central repository is a normal pull of the master branch of the upstream remote. These can be done from the SourceTree UI as well or from the command line:

    Code Block
    # get all changes from your own bitbucket repository
git checkout master
# get all changes from our central repository
git pull upstream master

  5. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix:

    Code Block
    git checkout -b <topic-branch-name>
  6. Commit your changes in logical chunks. Please adhere to these git commit message guidelines or your code is unlikely to be merged into the main project. Use Git's interactive rebase feature to tidy up your commits before making them public. Try to squash you changes in as little logical commits as possible, preferably one. 

  7. Locally merge (or rebase) the upstream development branch into your topic branch to ensure you incorporate the latest code from the main project:

    Code Block
    git pull [--rebase] upstream master

  8. Push your topic branch up to your fork:

    Code Block
    git push origin <topic-branch-name>
  9. Open a pull request with a clear title and description against our master branch. If this request is associated to an open bug report or feature request, please include the JIRA issue key.

...