Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
joyfullservice committed Jul 20, 2021
2 parents 15e9f21 + 98fc8ce commit 4a1be96
Show file tree
Hide file tree
Showing 95 changed files with 4,061 additions and 1,251 deletions.
21 changes: 12 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
Found an Issue? Have an idea?
---------
The easiest way to contribute is to create a detailed [Issue](https://github.com/joyfullservice/msaccess-vcs-integration/issues). Be sure to include details about the version of OS, Access, and VCS add-in.
If you can, provide a [Minimal Reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example) of the problem.
Found a Problem? Have an Idea?
=============
The easiest way to contribute is to create a detailed [Issue](https://github.com/joyfullservice/msaccess-vcs-integration/issues). Be sure to include details about the version of OS, Access, and VCS add-in. If you can, provide a [Minimal Reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example) of the problem.

Also be sure to check out the [Project Wiki](https://github.com/joyfullservice/msaccess-vcs-integration/wiki) which contains detailed documentation and other helpful tips for using this add-in.


Development Version
---------
If you want the very latest updates since the last published release, you will need to build it from source. Here is how to go from GitHub to git, to Access:

* Make sure you have a fairly recent version of the add-in installed. If not,
* Make sure you have a fairly recent version of the add-in installed. If not:
* Download the latest release.
* Install the add-in. (Just open *Version Control.accda*. If the add-in is already installed, you will be dropped into the VBA editor without further comment.)
* Install the add-in. (Just open *Version Control.accda*.)
* Clone this repository.
* Pull your clone down to your local machine.
* Choose a branch in git. (Typically `master`)
* Choose a branch in git. (Typically `dev`)
* Use the add-in to *Build From Source*, selecting the cloned `Version Control.accda.src` folder.
* Run the newly compiled *Version Control.accda* file to install the development version.

Making your first Pull Request (PR)
---------
A *Pull Request* is how you can propose that your code changes be included in the main project. (This project is the work of many people who have donated their efforts to make it better for everyone.) If you followed the steps to get to the Development Version then you can follow these steps to go back from Access to git, back up to GitHub:
* *Optional: For larger changes, you may consider making a branch that describes the changes you are proposing.*
* *Optional: For larger changes, you should consider making a branch that describes the changes you are proposing.*
* Open the development copy of *Version Control.accda* from the cloned GitHub project.
* Perform testing on your development version.
* Make updates to the database project. (This is where the magic happens)
Expand All @@ -34,6 +36,7 @@ A *Pull Request* is how you can propose that your code changes be included in th
* _*When creating the commit, please select only the files that reflect the actual changes you are proposing. It is usually not necessary to include auto-generated files that don't include substantive or intended changes._
* **Push** your branch up to your cloned repository.
* Make a **pull request** to the upstream project! Be sure to clearly describe what you did and why in the pull request. This will allow reviewers to better understand why your PR should be merged.
* Pull requests should target the `dev` branch, where most active development takes place. `Master` branch PRs should be mainly limited to Wiki changes. Critical bug fixes can be cherry-picked over to the `master` branch if needed.
* *Tip: If you have many different types of changes to propose, please use different pull requests for each of them. That will be easier to review and implement them individually.*

Thank you again for your support for the Microsoft Access development community!!
Thank you again for your support for the Microsoft Access development community!!
2 changes: 1 addition & 1 deletion Testing/Testing.accdb.src/dbs-properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"Type": 1
},
"Theme Resource Name": {
"Value": "Office Theme",
"Value": "Angles",
"Type": 10
},
"Themed Form Controls": {
Expand Down
Loading

0 comments on commit 4a1be96

Please sign in to comment.