search

BlockchainCommons / Community

Discussions & shared documents for stakeholders in Blockchain Commons
Other
68 stars 10 forks source link

Update dates #183

Closed Gitongamiriam closed 1 year ago

Gitongamiriam commented 1 year ago
ChristopherA commented 1 year ago

@Gitongamiriam: Your PR has merge conflicts. Contact @shannona for help to puzzle out how to fix, and how to avoid them in the future.

shannona commented 1 year ago

Hi @Gitongamiriam. A merge conflict means that some changes you made conflict (or seem to conflict) with some other changes made between when you started your edit (usually when you did a fork or clone) and when you ended your edit (usually when you submit your pull, though alternatively when someone looks at your PR if it's been sitting around for a while).

(I say "seems to" because the GitHub merging isn't always as robust as we'd like and sometimes there are actually no changes to the section that you also changed but GitHub is just confused due to to other changes in the document.)

The only way to really avoid merge conflicts is to be quick: to make sure that your fork/clone is 100% up-to-date when you start making changes, and then to submit your PR as soon as possible. On the web, you can keep up-to-date by going to the main page of your fork and seeing if it's some number of "commits behind" and if so choosing to "Sync Fork"; on a local clone, you can similarly do so by "git pull"ing down changes before you make updates. Once you start making changes on your side, things get more complex, so do the update first!

When you don'd do that (and obviously that's not always possible: sometimes you're working on things for a while and sometimes someone else is working exactly when you are), then the dreaded resolve-conflicts box shows up:

Screenshot 2023-02-14 at 7 43 56 AM

(Not sure if you can see that or it only shows up for people with certain perms.)

So, why is there a merge conflict on your PR?

If your case, your fork says:

This branch is [4 commits ahead](https://github.com/Gitongamiriam/Community/compare/BlockchainCommons:Community:master...update-dates), [3 commits behind](https://github.com/Gitongamiriam/Community/compare/update-dates...BlockchainCommons:Community:master) BlockchainCommons:master.

It was created somewhere before December 22, and there are conflicts because there have been three commits to the main branch since you forked that:

Screenshot 2023-02-14 at 7 50 36 AM

So, if you were just doing fresh work in the last few days, best practice would have been to do so with a fresh or updated copy of the original repo.

When you click on the Resolve Conflicts button, and again, I don't know if you can see it or not, you see all the conflicted areas.

Here's the four in this PR:

1:

<<<<<<< update-dates
* **[European Blockchain Convention](https://eblockchainconvention.com)** 2023/02/15 - 2023/02/17  Barcelona
* **Real World Crypto 2023** 2023/03/27 - 2023/03/29 Tokyo, Japan
* **Bitcoin Miami** 2023/05/18 - 2023/05/20  Miami Beach
* **[Dweb Camp](https://dwebcamp.org)** 2023/06/21 - 2023/06/25  Camp Navarro CA
* **[OAuth Security Workshop](https://oauth.secworkshop.events)** 2023/08/22 - 2023/08/24  Royal Holloway University, London/UK
* **[IIW](https://internetidentityworkshop.com)** XXXVII Fall: 2023/10/10 - 2023/10/12
* **[Identity Week Asia](https://www.terrapinn.com/exhibition/identity-week-asia/index.stm)** 2023/11/07 - 2023/11/08  Suntec Convention Centre, Singapore
=======
* **European Blockchain Convention** <https://eblockchainconvention.com/>
    * 2023/02/15 - 2023/02/17 | Barcelona
* **Real World Crypto 2023** 2023/03/27 - 2023/03/29 | Tokyo, Japan
* **Bitcoin Miami** 2023/05/18 - 2023/05/20 | Miami Beach
* **Dweb Camp** <https://dwebcamp.org/>
    * 2023/06/21 - 2023/06/25 | Camp Navarro CA
* **OAuth Security Workshop** <https://oauth.secworkshop.events/>
    * 2023/08/22 - 2023/08/24 | Royal Holloway University, London/UK
* **IIW** XXXVII Fall: 2023/10/10 - 2023/10/12     
* **Identity Week Asia** <https://www.terrapinn.com/exhibition/identity-week-asia/index.stm>
    * 2023/11/07 - 2023/11/08 | Suntec Convention Centre, Singapore
>>>>>>> master

2: 

<<<<<<< update-dates
* [IETF](https://www.ietf.org)
   * IETF 116 2023/03/25 - 2023/03/31 Yokohama Japan
   * IETF 117 2023/07/22 - 2023/07/28 San Francisco
=======
* IETF <https://www.ietf.org/> 
    * IETF 116 2023/03/25 - 2023/03/31 | Yokohama Japan
    * IETF 117 2023/07/22 - 2023/07/28 | San Francisco 
>>>>>>> master

3:

<<<<<<< update-dates
* [The Blockchain event](https://www.theblockchainevent.com/east) 2023/02/14 - 2023/02/17 Fort Lauderdale, Florida

* [The World’s NFT Meeting](https://www.nftparis.xyz) 2023/02/24 - 2023/02/25 Grand Palais, Paris

* [Consensus](https://www.coindesk.com/events) 2023/04/26 - 2023/04/28 Austin, Texas

* [Web Summit Rio](https://rio.websummit.com/) 2023/05/01 - 2023/05/04 Rio de Janeiro, Brazil   

* [Web3](http://web3summit.com)  2023/06/28 - 2023/06/29 London, Hornsey Rd, UK

* [The Advancing Bitcoin Conference](https://www.advancingbitcoin.com/enterprise/2023/) 2023/09/14 - 2023/09/15 Malaga, Spain

* [Crypto 2023](https://crypto.iacr.org/2023/) 2023/08/19 - 2023/08/24 Santa Barbara, USA Submission deadline: 16 February 2023

* [TABConf 2023](https://2023.tabconf.com/) 2023/09/06 - 2023/09/09 Atlanta, Georgia, USA

=======
* The Blockchain event <https://www.theblockchainevent.com/east/>
    * 2023/02/14 - 2023/02/17 | Fort Lauderdale, Florida

* The World’s NFT Meeting <https://www.nftparis.xyz/>
    * 2023/02/24 - 2023/02/25 | Grand Palais, Paris

* Consensus <https://www.coindesk.com/events>
    * 2023/04/26 - 2023/04/28

* Web Summit Rio <https://rio.websummit.com//>   
    * 2023/05/01 - 2023/05/04 | Rio de Janeiro, Brazil.   

* Web3 <http://web3summit.com>   
    * 2023/06/28 - 2023/06/29 | London, Hornsey Rd, London N7 7AJ, UK
>>>>>>> master

4:

<<<<<<< update-dates
=======
* Singapore Blockchain Week <https://singaporeblockchain.org/singapore-blockchain-week-one-of-asias-largest-blockchain-events-returns-from-25-to-29-july-2022/>  
>>>>>>> master

In each case, it shows your update between <<<<<<< your-branch-name and ======= and the current state of the repo between ======= and >>>>>>> master. So what you need to do is integrate the two conflicted states into a coherent whole and remove the <<<<<<< your-branch-name, =======, and >>>>>>> master lines.

Often it's really easy, and you just need to excise the old version and include your new version (or vice versa), because GitHub claimed there was a conflict when there wasn't. So, for the fourth one you'd just edit that part of the "Resolve Conflicts" text to read as follows, to favor the new info added since your fork:

* Singapore Blockchain Week <https://singaporeblockchain.org/singapore-blockchain-week-one-of-asias-largest-blockchain-events-returns-from-25-to-29-july-2022/>

I haver a suspicion that all four "conflicts" just represent updates to the master file since your fork, but you'll want to see if you put in any new info that needs merging into that.

If you have access to the "resolve conflicts" button, you should go through and do that for all four conflicts. Christopher or I will then have a clean PR to merge. If you don't, you should give us a preferred, deconflicted text for each of the conflicts that we can insert to clean things up.