issue144:c_c
Différences
Ci-dessous, les différences entre deux révisions de la page.
Les deux révisions précédentesRévision précédenteProchaine révision | Révision précédente | ||
issue144:c_c [2019/05/03 08:27] – d52fr | issue144:c_c [2019/05/07 11:41] (Version actuelle) – andre_domenech | ||
---|---|---|---|
Ligne 1: | Ligne 1: | ||
**The last few months have seen me spending more time trying to collaborate with other people (on statically generated websites, generally). In doing so, I’ve discovered a system that I find works well for me, and for most of the people I’ve worked with. As such, I wanted to share my method with my readers, and a few gotchas I ran into along the way.** | **The last few months have seen me spending more time trying to collaborate with other people (on statically generated websites, generally). In doing so, I’ve discovered a system that I find works well for me, and for most of the people I’ve worked with. As such, I wanted to share my method with my readers, and a few gotchas I ran into along the way.** | ||
- | Les derniers mois m'ont vu passer plus de temps à essayer de collaborer avec d' | + | Les derniers mois m'ont vu passer plus de temps à essayer de collaborer avec d' |
**The Setup | **The Setup | ||
Ligne 11: | Ligne 11: | ||
Le paramétrage | Le paramétrage | ||
- | Je commence en paramétrant un nouveau projet dans un dépôt git privé sur GitLab, et en partageant le dépôt avec d' | + | Je commence en paramétrant un nouveau projet dans un dépôt git privé sur GitLab et en partageant le dépôt avec d' |
- | Une fois que vous avez mis la structure de base dans le dépôt, c'est en général un travail conjoint quand il s'agit de créer ou de déplacer le contenu. | + | Une fois que vous avez mis la structure de base dans le dépôt, c'est en général un travail conjoint quand il s'agit de créer ou déplacer le contenu. |
**Once the content is largely there (even if in draft form), that is when I start creating templates and shortcodes, or tweaking standard settings for special use-cases. The reason for this is pretty simple - if the content isn’t there, it’s hard to tell what repeats often enough to warrant a shortcode, or what elements you want to put into a partial template to reduce repetition. | **Once the content is largely there (even if in draft form), that is when I start creating templates and shortcodes, or tweaking standard settings for special use-cases. The reason for this is pretty simple - if the content isn’t there, it’s hard to tell what repeats often enough to warrant a shortcode, or what elements you want to put into a partial template to reduce repetition. | ||
Ligne 21: | Ligne 21: | ||
That’s pretty much it. All the discussions and bug tracking happens in the repository itself. If documentation is required, I’ll use the Wiki function. If you want to have a collaborative brainstorming session, I wouldn’t recommend trying to fit it all into an issue on GitLab, but something like Discord/ | That’s pretty much it. All the discussions and bug tracking happens in the repository itself. If documentation is required, I’ll use the Wiki function. If you want to have a collaborative brainstorming session, I wouldn’t recommend trying to fit it all into an issue on GitLab, but something like Discord/ | ||
- | Quand le contenu est là en grande partie (même s'il est sous forme d' | + | Quand le contenu est là en grande partie (même s'il est sous forme d' |
- | La gestion des vraies validations et det du dépôt se fait en utilisant GitHub Desktop (bureau GitHub) ou la ligne de commande (CLI - bien que l' | + | La gestion des vraies validations et du dépôt se fait en utilisant GitHub Desktop (bureau GitHub) ou la ligne de commande (CLI - bien que l' |
- | C'est à peu près tout. Tous les échanges et la chasse aux bugs se passent dans le dépôt lui-même, Si une documentation est exigée, j' | + | C'est à peu près tout. Tous les échanges et la chasse aux bugs se passent dans le dépôt lui-même, Si une documentation est exigée, j' |
**Why GitLab? | **Why GitLab? | ||
Ligne 35: | Ligne 35: | ||
Pourquoi GitLab ? | Pourquoi GitLab ? | ||
- | J'ai commencé à utiliser GitLab avant que GitHub offre des dépôts privés gratuitement à des utilisateurs, | + | J'ai commencé à utiliser GitLab avant que GitHub |
+ | |||
+ | Aucun de mes dépôts n'a jamais dépassé la limite de stockage des 10 Go et le pisteur de problèmes permet aux gens de s' | ||
**Gotchas | **Gotchas | ||
Ligne 42: | Ligne 44: | ||
Also, try to commit groups of files at a time using GitHub Desktop, as it’s easier to roll back a feature if each commit is dedicated to one change or topic. This also doesn’t need to be done after every change, but just take some time to check/ | Also, try to commit groups of files at a time using GitHub Desktop, as it’s easier to roll back a feature if each commit is dedicated to one change or topic. This also doesn’t need to be done after every change, but just take some time to check/ | ||
+ | |||
+ | Les écueils | ||
+ | |||
+ | D' | ||
+ | |||
+ | Essayez aussi de valider (« commit ») d'un coup un groupe de fichiers en utilisant GitHub Desktop, car c'est plus facile de faire faire marche arrière à une fonctionnalité si chaque commit est dédié à une modification ou un sujet. Ceci n'a pas besoin d' | ||
**Merge conflicts - sometimes you start a change while someone else is plugging away remotely, only to find out you need to pull before you can push your changes to the server… Then it turns out that some of the changes you’ve made were done by someone else too. It can be a bit of a pain, but there’s nothing more to do than to go through and sort out any conflicts that can’t be automatically remedied. Just keep this in mind, and remind the other people you’re working with to pull regularly (in the day and age of Dropbox, some beginners have trouble to remember it’s a manual sync). | **Merge conflicts - sometimes you start a change while someone else is plugging away remotely, only to find out you need to pull before you can push your changes to the server… Then it turns out that some of the changes you’ve made were done by someone else too. It can be a bit of a pain, but there’s nothing more to do than to go through and sort out any conflicts that can’t be automatically remedied. Just keep this in mind, and remind the other people you’re working with to pull regularly (in the day and age of Dropbox, some beginners have trouble to remember it’s a manual sync). | ||
Image files - those you’re working with should have a shortlist of things to do to reduce overall image sizes. Since a lot of images from DSLRs or mirrorless cameras (and even some phones) can have massive resolutions, | Image files - those you’re working with should have a shortlist of things to do to reduce overall image sizes. Since a lot of images from DSLRs or mirrorless cameras (and even some phones) can have massive resolutions, | ||
+ | |||
+ | Conflits de fusion - parfois, vous commencez une modification alors qu'une autre personne travaille à distance, pour découvrir que vous ne pouvez que tirer (« pull ») avant de pousser (« push ») vos modifications dans le serveur... Ensuite, il apparaît que certaines de vos modifications ont aussi été faites par quelqu' | ||
+ | |||
+ | Fichiers images - ceux avec qui vous travaillez doivent avoir un mémo des choses à faire pour réduire la taille globale des images. Puisque beaucoup d' | ||
**Issues - in GitLab, I tend to put multiple items in a single issue (such as “design issues” full of CSS changes that need to be fixed). As I go through fixing them, I use strikethrough formatting to show which items are done and which are not, while also commenting the commit hash value. This way, anyone who reads the issue can get a good grasp on the timeline of edits, and I can check back to see when exactly I fixed an issue (in case it’s mistakenly re-created later). Also, if you aren’t subscribed, tagged, being replied to, or assigned to an issue, you won’t get email notifications for comments. Keep that in mind if you want to receive them anyways.** | **Issues - in GitLab, I tend to put multiple items in a single issue (such as “design issues” full of CSS changes that need to be fixed). As I go through fixing them, I use strikethrough formatting to show which items are done and which are not, while also commenting the commit hash value. This way, anyone who reads the issue can get a good grasp on the timeline of edits, and I can check back to see when exactly I fixed an issue (in case it’s mistakenly re-created later). Also, if you aren’t subscribed, tagged, being replied to, or assigned to an issue, you won’t get email notifications for comments. Keep that in mind if you want to receive them anyways.** | ||
+ | |||
+ | Problèmes - dans GitLab, j'ai tendance à mettre plusieurs éléments dans un seul problème (comme « problèmes de conception », plein de modifications du CSS qui ont besoin d' | ||
**Can I use this for other things too? | **Can I use this for other things too? | ||
Sure! You don’t need to be a programmer to use git. I can see this approach being useful for managing documentation for something, or a curated cookbook (as I have done for C&C at one point). Even if the repository stays largely empty, you still have access to an issue tracker, Wiki, and other useful tools.** | Sure! You don’t need to be a programmer to use git. I can see this approach being useful for managing documentation for something, or a curated cookbook (as I have done for C&C at one point). Even if the repository stays largely empty, you still have access to an issue tracker, Wiki, and other useful tools.** | ||
+ | |||
+ | Puis-je utiliser ceci pour d' | ||
+ | |||
+ | Bien sûr ! Vous n'avez pas besoin d' | ||
**Conclusion | **Conclusion | ||
I hope this article is helpful to anyone who is trying to collaborate with other people, but hasn’t yet found an ideal way to keep everyone up to date. If you have any comments, questions, or suggestions, | I hope this article is helpful to anyone who is trying to collaborate with other people, but hasn’t yet found an ideal way to keep everyone up to date. If you have any comments, questions, or suggestions, | ||
+ | |||
+ | Conclusion | ||
+ | |||
+ | J' |
issue144/c_c.1556864829.txt.gz · Dernière modification : 2019/05/03 08:27 de d52fr